Cleaned up old packages.
Added more stuff.
Prototyping