Got rid of area stuff, ready to compile and tag first release!