Cleaned up everything and added insert statements to build script.