Checked some stuff off TODO list