Initial commit

Still working on some stuff before testing.