Work from last meeting

Please pull :)