DEFINITIVE IMPLEMENTED VERSION 0.3!!

Contains everyone's code up to this point