Final 0.6 functionality. Needs to be tested though.