Code Organization
Bugfixes to attacking as-per the test cases