AE: Comment out all the changes I made and start again
AE: A few other things, this is the version I'll be referring to in issue #129