almost solved, needs cleanup