finally getting some shit working
merging