Ready and debug

My Changes for you to play with.