Working Update

All Features Work. Some cleanup & comments required.