Station refactored slightly - issues remain