Complete Update

A total replacement of the old version with this much better alpha
version