added a lot of funcitonality, got rid of main view. looks pretty now too (mostly)