removed previous base and abstracted data to models

Signed-off-by: Austin Ducworth <austin@ehousestudio.com>