Edited more, setting up for later