Better code layout
Add instant data type
More work