The start of a better Baseline

This will probably take a while because I have lots of idea.