Added implementation, began work on parser