Some more additions. Probably putting this on hold for a bit.