Made changes to account for empty view and initialization, but they don't have any effect.
Got empty view working, but not initialization. Forgot to commit earlier