Final changes for project, kinda want to add more later