A bit of an overhaul to the grammar and included if-statements.