Integrate barebones branch #7

Closed nothingrandom closed 9 years ago