Uh... Sorta forgot to commit after last working on this. Not sure where
it stands. Dumping this here for historical purposes