Test

General housekeeping. Functional so far.