Major rework. Multiple issues fixed
Version Bump