WIP
Move things around
Implement a much better wait-time notifier