Almost forgot to commit today

Wrote some random stuff while waiting for design decisions