Mostly done

Test works, assertion works