major changes in code structure to remove redundant code, currently very buggy though, do not pull until marked as resolved
Fixed bugs, needs further testing before intergration
Added minor cosmetic changes
Added more minor cosmetic changes