Finished add and moved things to helpers