Updated with phase2 and research

Tell me if there is anything wrong :p