Basic set up
Fixed bugs