Fixed issues with pretty printing
Got started on the new inheritance