Complete Rewrite

As I get better at this, so shall my site.
This is still in progress