Overhauled program structure to be more objecty
Re-added example problems