Merged
Adding draw functionallity back to Overylay where it belongs