Finished! and added funky features