Added some more stuff to my project, merging