Splitting stuff up
wip