wip: Began adding final project stuff