Final Version?

Logic is complete needs testing