ready to merge, just need some basic spec tests