Restart

Split into UI, Logic and Test