Almost done with semester implementation

only problem is concurrency -.-