finally starting to turn this thing into a proper system