Finished with the expansion thing. This could make a pretty awesome open source library