Handle splat

Closes #7 

Just check the last two commits (October 7th)