Major refactor code is in working state