Working on Altar and general structure generation. Not finished by I need to test.
Merge remote-tracking branch 'origin/master'