Major rewrite. Adds more instructions. Fixes indentation problems.