Working Prototype

Fixed all bugs