Fixed parser issues, began work on parser