More like a proper framework now..