Refactored last parse
Cleaned up ourstache
Removed cruft