Finished major changes - testing still to be done