Moving more functionality into .m files.