Work on #3

Functionality added. Texture and QA remaining.