Final commit for Alpha 3!!!