Task #33 - WIP - basic test passing