Final Version 1.0, now working