Working on failing tests

Please don't merge, this is just for testing as yet.