Working branch

Get shit working.