Experimenting with value types
Added TODO's