unstable, working on view tracking
pushing all changes from last couple days