Looks stuff wired up, bunch of merge bug fixes, some bugs with views still existent, will log on trello