Fix Bases

The implementation of bases in the current structure are broken. This is here to address how I am going to fix that.