Fixed stupid bug, initial prototype working