Fixed requires problems, first version finished