Started working on implementing managers and further organizing code