More additions

Getting organized but still terrible, don't use me!