More name changes, added mouse down and up functionality