Working on migrating methods into separate files, general WIP.