major restyling and refactoring, ready to move forward...