* exlorative coding
Major refactoring to adhere better to standards