New pass at proper website support
Commit forsecond attempt at website