Cleaned up some code
Working dynamic inheritance
Removed unnecessary complexity from parser
More code cleanup of the main parser