refactored models. Made way for multiple listeners. updated to scala 2.10