started moving stuff out of the main file