Initial testing work
Move things
Complete
Add some Build stuff