beginning to split things up into more logical sections/files