using now celltype enum instead of ints
merged into one initialize method
refactored some stuff into helper methods & other classes