diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
index 8fcc2bbe1c..312cda9a78 100644
--- a/examples/basecoin/app/app.go
+++ b/examples/basecoin/app/app.go
@@ -32,15 +32,18 @@ type BasecoinApp struct {
 
 // NewBasecoinApp - create new BasecoinApp
 // TODO: This should take in more configuration options.
-// TODO: This should be moved into
+// TODO: This should be moved into baseapp to isolate complexity
 func NewBasecoinApp(genesisPath string) *BasecoinApp {
 
 	// Create and configure app.
 	var app = &BasecoinApp{}
 
-	app.initCapKeys()  // ./init_capkeys.go
-	app.initBaseApp()  // ./init_baseapp.go
-	app.initStores()   // ./init_stores.go
+	// TODO open up out of functions, or introduce clarity,
+	// interdependancies are a nightmare to debug
+	app.initCapKeys() // ./init_capkeys.go
+	app.initBaseApp() // ./init_baseapp.go
+	app.initStores()  // ./init_stores.go
+	app.initBaseAppInitStater()
 	app.initHandlers() // ./init_handlers.go
 
 	genesisiDoc, err := bam.GenesisDocFromFile(genesisPath)
@@ -50,26 +53,27 @@ func NewBasecoinApp(genesisPath string) *BasecoinApp {
 
 	// TODO: InitChain with validators from genesis transaction bytes
 
-	// set first begin block
+	// very first begin block used for context when setting genesis accounts
 	header := abci.Header{
 		ChainID:        "",
 		Height:         0,
-		Time:           -1, // TODO
-		NumTxs:         -1, // TODO
+		Time:           -1,
+		NumTxs:         -1,
 		LastCommitHash: []byte{0x00},
-		DataHash:       nil, // TODO
-		ValidatorsHash: nil, // TODO
-		AppHash:        nil, // TODO
+		DataHash:       nil,
+		ValidatorsHash: nil,
+		AppHash:        nil,
 	}
 	app.BaseApp.BeginBlock(abci.RequestBeginBlock{
-		Hash:                nil, // TODO
+		Hash:                nil,
 		Header:              header,
-		AbsentValidators:    nil, // TODO
-		ByzantineValidators: nil, // TODO
+		AbsentValidators:    nil,
+		ByzantineValidators: nil,
 	})
 
 	ctxCheckTx := app.BaseApp.NewContext(true, nil)
 	ctxDeliverTx := app.BaseApp.NewContext(false, nil)
+
 	err = app.BaseApp.InitStater(ctxCheckTx, ctxDeliverTx, genesisiDoc.AppState)
 	if err != nil {
 		panic(fmt.Errorf("error loading application genesis state: %v", err))
diff --git a/examples/basecoin/app/app_test.go b/examples/basecoin/app/app_test.go
index 8687d47dc4..9178820126 100644
--- a/examples/basecoin/app/app_test.go
+++ b/examples/basecoin/app/app_test.go
@@ -57,11 +57,12 @@ func TestSendMsg(t *testing.T) {
 		PubKey:   pk,
 		Sequence: 0,
 	}
-	accs := []*GenesisAccount{
-		NewGenesisAccount(types.AppAccount{baseAcc, "foobart"}),
-		NewGenesisAccount(types.AppAccount{baseAcc, "endofzeworld"}),
+	acc := types.AppAccount{baseAcc, "foobart"}
+
+	gaccs := []*GenesisAccount{
+		NewGenesisAccount(acc),
 	}
-	bytes, err := json.MarshalIndent(&accs, "", "\t")
+	bytes, err := json.MarshalIndent(&gaccs, "", "\t")
 
 	app := tba.BasecoinApp
 	ctxCheckTx := app.BaseApp.NewContext(true, nil)
@@ -69,4 +70,6 @@ func TestSendMsg(t *testing.T) {
 	err = app.BaseApp.InitStater(ctxCheckTx, ctxDeliverTx, bytes)
 	require.Nil(t, err)
 
+	res1 := app.accountMapper.GetAccount(ctxDeliverTx, baseAcc.Address)
+	assert.Equal(t, baseAcc, res1)
 }
diff --git a/examples/basecoin/app/init_baseapp.go b/examples/basecoin/app/init_baseapp.go
index 14402ef4a6..34272e6bb5 100644
--- a/examples/basecoin/app/init_baseapp.go
+++ b/examples/basecoin/app/init_baseapp.go
@@ -93,10 +93,8 @@ func (app *BasecoinApp) initBaseAppInitStater() {
 			if err != nil {
 				return sdk.ErrGenesisParse("").TraceCause(err, "")
 			}
-
-			//panic(fmt.Sprintf("debug acc: %s\n", acc))
-			accountMapper.SetAccount(ctxCheckTx, &acc.BaseAccount)
-			accountMapper.SetAccount(ctxDeliverTx, &acc.BaseAccount)
+			accountMapper.SetAccount(ctxCheckTx, acc.BaseAccount)
+			accountMapper.SetAccount(ctxDeliverTx, acc.BaseAccount)
 		}
 		return nil
 	})