Commit an in progress system using springs

Still kind of buggy, but best attempt yet