added So many bugs design, fixes gh-1