Started to get it up and running
Fixed a bug