Broke stuff into parts for upcoming additions

see above