REFACTORING - making things more modular so cellars and timelines for other users can be accessed