Cleaned things up, experimented with jquery events, failed