rearranged sources
part 1 done
functions complete