Refactored parsing to backend, cleaned up front end