nothing major

made things into functions