Hw8

All notes and implementation details are on ChangeLog