cleaned up code, began wipein testing