WIP
Added tests..