Huge feature and bug fixes
Test