Added more classes
More class files and logic added. Still not in a working state