Finished Area (for now)
Fixed bug