Removed redundant TODO,added size calculation. Will test tomorrow.
Hopefully.