merged both projects. IDK if this even works