Checking in partial code, because it's time to try Angular...