Very close to building cleanly here.. :O