Most functions for project now working