Added some progress, found some bugs