Setup stuff branched

Taken out any setup tools and moved to branch