Rep 282 spring refactor - NO MERGIE

# SWEET JESUS DON'T MERGE THIS

Just to get jenkins to build stuff for us, kthx