Almost Done, working mainly on details now