messy code - services

use of Factory and controllers. Still testing.