Finished first stage, all bugs fixed