Re-did most of the code

More concise, old cold and debuging still in as comments
n = 0 is done, started work on n = 1