Checked off some TODO list things