Fixed few things and added bus and filter, both very much wip.