Code

- shuffling some code around to keep things tidy.