Clean up
First stylus implementation

NOTE: WIP - Untested!