Making another commit here because some serious changes are about to happen