WIP - to new design
WIP - Workable. Waiting animation and code tuning