still some hacky edges