Finished the basic features :D