I can't seem to do this any other way, if you have any suggestions on my new commits do let me know.