More TODO
Use class instead of struct
Added Integer class