Added boxes

Also changed the class structure a little
added something to the TODO list