This part should be removed in favor of #55 IMO