Revert 10f0edd..4e17e19

This rolls back to commit 10f0eddddb53091855e38659ca627a62c6215d0c.
User stuff + pic integration + basics