More changes.... Finished prototype!!!
Fixed some routes