THIS IS NOT DONE. GET THE 1.0 TAG. Pushing this up so I can work on it later