Added rest of rest of project

Even better stuff