-moving things around
-integrating silvio's stuff