Implemented / fixed a bunch of TODO's