removed setPeen
Attempt to clean up the code. Contains untested code.
Merging Beagon's and Tyil's work