Add in proper builds
Fix some stuff
Add more