Final changes.. handing it up now

not all features implemented