Further cleanup, branching for logic additions
Further cleanup and branch testing