remove .m.x() stuff because lol bad idea
add tests (are you happy now, naomi? :D)