0.5

api - not fully done!