Initial code commit as moving code from current class and cleaning up