cleaned out some notes, applied some changes and added controllers and factory section