Completed base features + reimplemented parsing.