Slowly fixing things.. I'll get it to build